bitkeeper revision 1.1023.1.4 (40e0456eh9GQjlKMip9VLoUGxtn2SA)
authormjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Mon, 28 Jun 2004 16:21:02 +0000 (16:21 +0000)
committermjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Mon, 28 Jun 2004 16:21:02 +0000 (16:21 +0000)
commit36d4bc757c5cebe60f7b0e7a38be94fd834e2938
treeedaa2bf374936a3ce012c87e0801a94e7d8d1d8d
parent9c3edd095a7ca2d79cd8a1b9c6afd9b106fce805
bitkeeper revision 1.1023.1.4 (40e0456eh9GQjlKMip9VLoUGxtn2SA)

More merge fixes.
tools/xc/lib/xc_linux_save.c
tools/xc/lib/xc_private.h
tools/xen/lib/xend/sxp.py